Merge whitespace.el version 13.1 from trunk.
authorChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:24:59 +0000 (12:24 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 6 Sep 2010 16:24:59 +0000 (12:24 -0400)

Trivial merge